Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 20:26:17 +0000 (13:26 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 20:26:17 +0000 (13:26 -0700)
commitb945da4c72a89bea94cdb9e2a0b0a7f0ab464343
tree8203a1d15334366e8cfb09595ff2962dad475f9d
parent9ec2916ce30b15b26fce00b9e15e49a2aa4b4c11
parent6046c102bb818f0e5c9d13828d5c3cdb4efaa4ce
Merge from trunk.